merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 13 Jan 2012 04:38:45 +0000 (13:38 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 13 Jan 2012 04:38:45 +0000 (13:38 +0900)
commit7d6e602d00ec63c1dbcacfa72ea34150d4545988
tree62a18d7098d2f68f9cc8a5fcab6462390b743efb
parent85cc5d746a60106da2a822105d501fd8682f03aa
parentc0d3b2750fb9d87d7ffea6df2873f4eb6997c8c6
merge trunk